From: Gert Wollny Date: Sat, 2 Jul 2016 11:47:28 +0000 (+0000) Subject: correct openssl patch X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~272 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=b8456321f629d94d6b86e2d2c8eab53572194f8f;p=dcmtk.git correct openssl patch --- diff --git a/debian/patches/09_openssl-1.1.patch b/debian/patches/09_openssl-1.1.patch index e04c4982..0a3c03e2 100644 --- a/debian/patches/09_openssl-1.1.patch +++ b/debian/patches/09_openssl-1.1.patch @@ -10,7 +10,7 @@ Bug-Debian: http://bugs.debian.org/828281 +#if OPENSSL_VERSION_NUMBER < 0x10100000L +#define SSL_CTX_get_cert_store(ctx) ctx->cert_store -+#define EVP_PKEY_id(key) key->type; ++#define EVP_PKEY_base_id(key) key->type; +#endif + extern "C" int DcmTLSTransportLayer_certificateValidationCallback(int ok, X509_STORE_CTX *storeContext); @@ -73,7 +73,7 @@ Bug-Debian: http://bugs.debian.org/828281 if (pubkey) { - switch (EVP_PKEY_type(pubkey->type)) -+ switch (EVP_PKEY_id(pubkey)) ++ switch (EVP_PKEY_base_id(pubkey)) { case EVP_PKEY_RSA: certPubKeyType = "RSA";